bpo-47103: Copy pgort140.dll into output directory when building PGInstrument on Windows by zooba · Pull Request #32083 · python/cpython

zooba · 2022-03-23T20:02:59Z

https://bugs.python.org/issue47103

…strument on Windows

neonene · 2022-03-25T22:00:58Z

The following 2 tests in test_embed.py failed with the same error:

test_init_pybuilddir_win32
test_init_pyvenv_cfg

Traceback (most recent call last):
  File "C:\cp\Lib\contextlib.py", line 155, in __exit__
    self.gen.throw(typ, value, traceback)
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "C:\cp\Lib\test\test_embed.py", line 1225, in tmpdir_with_python
    yield tmpdir
    ^^^^^^^^^^^^
  File "C:\cp\Lib\test\test_embed.py", line 1347, in test_init_pybuilddir_win32
    self.check_all_configs("test_init_compat_config", config,
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "C:\cp\Lib\test\test_embed.py", line 738, in check_all_configs
    out, err = self.run_embedded_interpreter(testname,
               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "C:\cp\Lib\test\test_embed.py", line 117, in run_embedded_interpreter
    self.assertEqual(p.returncode, returncode,
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: 3221225781 != 0 : bad returncode 3221225781, stderr is ''

neonene · 2022-04-05T03:43:47Z

@@ -132,9 +132,6 @@ set PYTHONPATH=$(PySourcePath)Lib
  </Target>
  <Target Name="GeneratePythonBat" AfterTargets="AfterBuild">
    <PropertyGroup>


Suggested change

<PropertyGroup>

<PropertyGroup>

<_PGOPath Condition="$(Configuration) == 'PGInstrument'">@set PATH=%PATH%%3B$(OutDir)</_PGOPath>

Leaving $(_PGOPath) like this fixes my errors. The way is more generic than #32146.

No, your other PR is better. We shouldn't rely on PATH for resolving DLLs, but should copy the right one alongside the executable.

But I see you've closed it, so I'll add a similar change to this PR.

The additional change is perfect for PGO/non-PGO.
I can confirm PGInstrument builds work with this.

miss-islington · 2022-04-06T10:57:11Z

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

miss-islington · 2022-04-06T10:57:11Z

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

miss-islington · 2022-04-06T10:57:37Z

Sorry, @zooba, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 074da788028c1f1e867dc81698efdcdc263f2288 3.9

miss-islington · 2022-04-06T10:57:39Z

Sorry @zooba, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 074da788028c1f1e867dc81698efdcdc263f2288 3.10

…strument on Windows (pythonGH-32083)

bedevere-bot · 2022-04-06T14:33:34Z

GH-32366 is a backport of this pull request to the 3.10 branch.

…strument on Windows (GH-32083)

bedevere-bot · 2022-04-07T22:23:35Z

GH-32407 is a backport of this pull request to the 3.9 branch.

…strument on Windows (GH-32083)

…strument on Windows (pythonGH-32083)

zooba added 2 commits March 23, 2022 20:01

bpo-47103: Copy pgort140.dll into output directory when building PGIn…

a35ca4e

…strument on Windows

Remove PATH modifications from python.bat

ea29eb7

zooba added the OS-windows label Mar 23, 2022

zooba requested a review from a team as a code owner March 23, 2022 20:03

the-knights-who-say-ni added the CLA signed label Mar 23, 2022

bedevere-bot added the awaiting core review label Mar 23, 2022

zooba closed this Mar 24, 2022

zooba reopened this Mar 24, 2022

neonene mentioned this pull request Mar 28, 2022

bpo-47103: Use the copy of pgort140.dll when running test_embed on Windows PGO #32146

Closed

neonene reviewed Apr 5, 2022

View reviewed changes

zooba added 2 commits April 5, 2022 16:27

Correct test_embed handling of DLLs

b581796

Merge remote-tracking branch 'cpython/main' into bpo-47103

d35085d

zooba merged commit 074da78 into python:main Apr 6, 2022

bedevere-bot removed the awaiting core review label Apr 6, 2022

zooba deleted the bpo-47103 branch April 6, 2022 10:56

zooba added needs backport to 3.9 needs backport to 3.10 only security fixes labels Apr 6, 2022

miss-islington assigned zooba Apr 6, 2022

zooba added a commit to zooba/cpython that referenced this pull request Apr 6, 2022

bpo-47103: Copy pgort140.dll into output directory when building PGIn…

2bcb6ca

…strument on Windows (pythonGH-32083)

bedevere-bot removed the needs backport to 3.10 only security fixes label Apr 6, 2022

zooba added a commit that referenced this pull request Apr 7, 2022

bpo-47103: Copy pgort140.dll into output directory when building PGIn…

b0ec17b

…strument on Windows (GH-32083)

bedevere-bot removed the needs backport to 3.9 label Apr 7, 2022

zooba added a commit that referenced this pull request Apr 8, 2022

bpo-47103: Copy pgort140.dll into output directory when building PGIn…

80c1153

…strument on Windows (GH-32083)

hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022

bpo-47103: Copy pgort140.dll into output directory when building PGIn…

d5d4f91

…strument on Windows (pythonGH-32083)

	<PropertyGroup>
	<PropertyGroup>
	<_PGOPath Condition="$(Configuration) == 'PGInstrument'">@set PATH=%PATH%%3B$(OutDir)</_PGOPath>

Uh oh!

Uh oh!

Conversation

zooba commented Mar 23, 2022 • edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

neonene commented Mar 25, 2022

Uh oh!

neonene Apr 5, 2022

Choose a reason for hiding this comment

Uh oh!

neonene Apr 5, 2022

Choose a reason for hiding this comment

Uh oh!

zooba Apr 5, 2022

Choose a reason for hiding this comment

Uh oh!

zooba Apr 5, 2022

Choose a reason for hiding this comment

Uh oh!

neonene Apr 6, 2022

Choose a reason for hiding this comment

Uh oh!

miss-islington commented Apr 6, 2022

Uh oh!

miss-islington commented Apr 6, 2022

Uh oh!

miss-islington commented Apr 6, 2022

Uh oh!

miss-islington commented Apr 6, 2022

Uh oh!

bedevere-bot commented Apr 6, 2022

Uh oh!

bedevere-bot commented Apr 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

zooba commented Mar 23, 2022 •

edited by bedevere-bot

Loading